Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 19 May 2010 11:43:55 +0000 (11:43 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 19 May 2010 11:43:55 +0000 (11:43 +0000)

Trivial merge